From 578c0a2b7c79a21501fa0b44c68c2605436a9e29 Mon Sep 17 00:00:00 2001 From: Dongxiao Xu Date: Fri, 30 Nov 2012 09:22:08 +0000 Subject: [PATCH] nested vmx: enable Monitor Trap Flag for L1 VMM Signed-off-by: Dongxiao Xu Acked-by: Jun Nakajima Committed-by: Keir Fraser --- xen/arch/x86/hvm/vmx/vvmx.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/hvm/vmx/vvmx.c b/xen/arch/x86/hvm/vmx/vvmx.c index 4f6c7125c4..c9532781cd 100644 --- a/xen/arch/x86/hvm/vmx/vvmx.c +++ b/xen/arch/x86/hvm/vmx/vvmx.c @@ -1259,7 +1259,7 @@ int nvmx_msr_read_intercept(unsigned int msr, u64 *msr_content) break; case MSR_IA32_VMX_PROCBASED_CTLS: /* 1-seetings */ - data = (CPU_BASED_HLT_EXITING | + data = CPU_BASED_HLT_EXITING | CPU_BASED_VIRTUAL_INTR_PENDING | CPU_BASED_CR8_LOAD_EXITING | CPU_BASED_CR8_STORE_EXITING | @@ -1272,7 +1272,8 @@ int nvmx_msr_read_intercept(unsigned int msr, u64 *msr_content) CPU_BASED_ACTIVATE_IO_BITMAP | CPU_BASED_USE_TSC_OFFSETING | CPU_BASED_UNCOND_IO_EXITING | - CPU_BASED_RDTSC_EXITING); + CPU_BASED_RDTSC_EXITING | + CPU_BASED_MONITOR_TRAP_FLAG; /* bit 1, 4-6,8,13-16,26 must be 1 (refer G4 of SDM) */ tmp = ( (1<<26) | (0xf << 13) | 0x100 | (0x7 << 4) | 0x2); /* 0-settings */ @@ -1475,6 +1476,11 @@ int nvmx_n2_vmexit_handler(struct cpu_user_regs *regs, if ( ctrl & CPU_BASED_VIRTUAL_NMI_PENDING ) nvcpu->nv_vmexit_pending = 1; break; + case EXIT_REASON_MONITOR_TRAP_FLAG: + ctrl = __n2_exec_control(v); + if ( ctrl & CPU_BASED_MONITOR_TRAP_FLAG) + nvcpu->nv_vmexit_pending = 1; + break; /* L1 has priority handling several other types of exits */ case EXIT_REASON_HLT: ctrl = __n2_exec_control(v); -- 2.30.2